Implement more fields