Feature/en 1889

Same goes for this constructor, it is a lot of arguments to keep track of as a client developer.