Added convenience tracker methods and minor code restructuring