Added helper classes back in