Domain module support

Updated tags

Small fix for potential problem in aggregate when no arguments are given