Cleaned up Fields API.