Moved keyword arguments to dicitionary;