More flexible AwareTrait