Added more checks