Several properties checks added