Rafactor and move PropertyMessage class