Moved id into base entity