Transitioning further toward using Definitions