added tracking option to register_map