Added more checks to the list