Added default states and equate maps to Settings