Implemented code to add properties to the kaf/naf