Removed project specific field handling from Base-class