Fixed Accessor Order and added proper related things