classification and rest interface tweaks