Added spacing module and updated map helpers