Re-factoring: full support of entities interface