Architecture revision, engine util functions, cell selection