Add support for multiline defs

Change-Id: I747797ba214ed691d15b20c9db6c95906a05afdd