Got rid of id getter and setter