Deleting the core class and moved the used code into core functions file. Code clean up in page and property class.