Switched to using getters and setters on core objects