Refactored to remove unecessary accessor creation