Further reducing exported interface