Removed all explicit getters and setters (preparing to recreate them as array indexes)