API for better handling defaults and functions fixes