Add traits support using an ENV flag