ClassHelper and more dynamic
Fix conflicts, add more dynamic