Modify structure

Improve settings and behaviour