Move entities to common