Improved handling of Procedures under different schemas.