Added system & some lookup tables to nav