Implement more options checking