Changing option handling
Implement data layer and data/list handling