Added macro functions