Added properties to client. No Hardcoding.