Added tags and nobranch options