Added back property checks