Make getters Nullable