Add more additional info enhancement, resolves #3