Samples updated. Map methods refactored.