changes to support Procedure