Add more debuginfo