Added own property checks