Moving to utilities for consistency