Refactoring commands into concerns and DataBag stuff