adding custom expression + explicit packages for api and custom code