Added menu commands and helper circles support