Add stateful constructors