Changes to support other projects