Minor additions to handle definitions