Updated files to handle numeric cases