Removed duplication in accessor