#171 interface improvements