allow to set default group, cleanup, added support for overloaded procedures