Feature/improvements