Added more checking methods