Adding new helper classes for devkit