Added decorator function generation; Removed some specialized tag functions