Some macro procedures added