Final formatting from last commit
Use map instead of single for, use proper for convention. Change package names and imports.
Mix in a ExecutionContext instead of using the standard