feat: Fixes entity translation, added other serializable entities, cleanup;