Restructured internal maps and settings