Extract names to the constructor too