Edited the singleEntity class