[master] Replacing list with struct