Added properties
Removed queries