Added helper defines and classes
missing files