Imported the files from branch 'fixed-map'