Updated input checking methods