Add support for multiple definitions and add pretty printed output