StarMap improvements