Removed property read code, needs to be refactored.