Sample map population + actions refactoring