Removed usage of custom Type Property