Fixed issue: Ability to be adaptive