Added data storage
fix name clashes
Record some data