added: a couple of concerns for more modularity
added: factories for concerns