modules: added custom completion functions