Model now accepts extendState as an second param