Added validation for packages and Changed macros for new forms