add improved helpers from stk-toolbox