(COMMIT-17) Commons and Address -> controller and entity