Feature/less improvements