Added state and address maps