Drop _disabled
Mark Entity{Id|Version} as serializable