- added new helper classes