Add a lot more information