Reduce argument exposal for prepare functions