Removed single entities. Adopted table dependency