Fixed TODO (removed edit and query in interface)