Add getters/setters for core classes