Add fill entity methods and magic getter and setter