Add debug info
Use lists instead of tuples