Added FUNCTION/PROCEDURE types.