Fixed addresses and added data annotations