Unit tweak for future extensibility