Feature/consistent modification syntaxt