Add remaining map stuff