diff --git a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcp b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcp
index 98feb301..f415ea51 100644
--- a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcp
+++ b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcp
@@ -1,13 +1,14 @@
 [HEADER]
 magic_cookie={66E99B07-E706-4689-9E80-9B2582898A13}
 file_version=1.0
+device=PIC18F6720
 [PATH_INFO]
 BuildDirPolicy=BuildDirIsSourceDir
 dir_src=
 dir_bin=
 dir_tmp=
 dir_sin=
-dir_inc=C:\code\bacnet-stack\include;C:\code\bacnet-stack\ports\pic18f6720
+dir_inc=C:\code\bacnet-stack\include;C:\code\bacnet-stack\demo\object;C:\code\bacnet-stack\ports\pic18f6720
 dir_lib=C:\mcc18\lib
 dir_lkr=
 [CAT_FILTERS]
@@ -83,7 +84,6 @@ file_056=.
 file_057=.
 file_058=.
 file_059=.
-file_060=.
 [GENERATED_FILES]
 file_000=no
 file_001=no
@@ -145,7 +145,6 @@ file_056=no
 file_057=no
 file_058=no
 file_059=no
-file_060=no
 [OTHER_FILES]
 file_000=no
 file_001=no
@@ -207,7 +206,6 @@ file_056=no
 file_057=no
 file_058=no
 file_059=no
-file_060=no
 [FILE_INFO]
 file_000=C:\code\bacnet-stack\src\abort.c
 file_001=C:\code\bacnet-stack\src\bacapp.c
@@ -236,47 +234,46 @@ file_023=bv.c
 file_024=ai.c
 file_025=bi.c
 file_026=av.c
-file_027=h_rp.c
-file_028=h_wp.c
-file_029=C:\code\bacnet-stack\src\wp.c
-file_030=C:\code\bacnet-stack\demo\handler\h_npdu.c
-file_031=C:\code\bacnet-stack\demo\handler\s_iam.c
-file_032=C:\code\bacnet-stack\src\bacreal.c
-file_033=C:\code\bacnet-stack\src\bacint.c
-file_034=C:\code\bacnet-stack\src\npdu.c
-file_035=C:\code\bacnet-stack\src\version.c
-file_036=apdu.c
-file_037=C:\code\bacnet-stack\demo\handler\noserv.c
-file_038=C:\code\bacnet-stack\src\fifo.c
-file_039=stdbool.h
-file_040=stdint.h
-file_041=rs485.h
-file_042=mstp.h
-file_043=C:\mcc18\h\p18f6720.h
+file_027=C:\code\bacnet-stack\src\wp.c
+file_028=C:\code\bacnet-stack\demo\handler\h_npdu.c
+file_029=C:\code\bacnet-stack\demo\handler\s_iam.c
+file_030=C:\code\bacnet-stack\src\bacreal.c
+file_031=C:\code\bacnet-stack\src\bacint.c
+file_032=C:\code\bacnet-stack\src\npdu.c
+file_033=C:\code\bacnet-stack\src\version.c
+file_034=apdu.c
+file_035=C:\code\bacnet-stack\demo\handler\noserv.c
+file_036=C:\code\bacnet-stack\src\fifo.c
+file_037=C:\code\bacnet-stack\demo\handler\h_wp.c
+file_038=C:\code\bacnet-stack\demo\handler\h_rp.c
+file_039=C:\code\bacnet-stack\src\bacaddr.c
+file_040=stdbool.h
+file_041=stdint.h
+file_042=rs485.h
+file_043=mstp.h
 file_044=C:\code\bacnet-stack\include\bits.h
 file_045=C:\code\bacnet-stack\include\abort.h
-file_046=C:\code\bacnet-stack\include\ai.h
-file_047=C:\code\bacnet-stack\include\apdu.h
-file_048=C:\code\bacnet-stack\include\bacaddr.h
-file_049=C:\code\bacnet-stack\include\bacapp.h
-file_050=C:\code\bacnet-stack\include\bacdcode.h
-file_051=C:\code\bacnet-stack\include\bacdef.h
-file_052=C:\code\bacnet-stack\include\bacenum.h
-file_053=C:\code\bacnet-stack\include\bacerror.h
-file_054=C:\code\bacnet-stack\include\bacint.h
-file_055=C:\code\bacnet-stack\include\bacprop.h
-file_056=C:\code\bacnet-stack\include\bacreal.h
-file_057=C:\code\bacnet-stack\include\bacstr.h
-file_058=C:\code\bacnet-stack\include\bigend.h
-file_059=C:\code\bacnet-stack\include\config.h
-file_060=18F6720.lkr
+file_046=C:\code\bacnet-stack\include\apdu.h
+file_047=C:\code\bacnet-stack\include\bacaddr.h
+file_048=C:\code\bacnet-stack\include\bacapp.h
+file_049=C:\code\bacnet-stack\include\bacdcode.h
+file_050=C:\code\bacnet-stack\include\bacdef.h
+file_051=C:\code\bacnet-stack\include\bacenum.h
+file_052=C:\code\bacnet-stack\include\bacerror.h
+file_053=C:\code\bacnet-stack\include\bacint.h
+file_054=C:\code\bacnet-stack\include\bacprop.h
+file_055=C:\code\bacnet-stack\include\bacreal.h
+file_056=C:\code\bacnet-stack\include\bacstr.h
+file_057=C:\code\bacnet-stack\include\bigend.h
+file_058=C:\code\bacnet-stack\include\config.h
+file_059=18F6720.lkr
 [SUITE_INFO]
 suite_guid={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
 suite_state=
 [TOOL_SETTINGS]
 TS{DD2213A8-6310-47B1-8376-9430CDFC013F}=
 TS{BFD27FBA-4A02-4C0E-A5E5-B812F3E7707C}=/m"$(BINDIR_)$(TARGETBASE).map" /o"$(TARGETBASE).cof"
-TS{C2AF05E7-1416-4625-923D-E114DB6E2B96}=-DPRINT_ENABLED=0 -DBACDL_MSTP=1 -DBIG_ENDIAN=0 -DMAX_APDU=50 -DMAX_TSM_TRANSACTIONS=0 -DMAX_CHARACTER_STRING_BYTES=64 -DMAX_OCTET_STRING_BYTES=64 -mL -Ls -Ou- -Ot- -Ob- -Op- -Or- -Od- -Opa-
+TS{C2AF05E7-1416-4625-923D-E114DB6E2B96}=-DPRINT_ENABLED=0 -DBACDL_MSTP=1 -DBIG_ENDIAN=0 -DMAX_APDU=50 -DMAX_TSM_TRANSACTIONS=0 -mL -Ls -Ou- -Ot- -Ob- -Op- -Or- -Od- -Opa-
 TS{ADE93A55-C7C7-4D4D-A4BA-59305F7D0391}=
 [INSTRUMENTED_TRACE]
 enable=0
diff --git a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw
index 2c9176b6..6e3f61af 100644
Binary files a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw and b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw differ