Removed type checking for empty optional fields