Retooling to make things more configurable