Added todo helper methods