WIP: Feature/improvements