Fixed missing include
Moved basic cell (list) operations