Add utilities for core functions