update getters and added missing include