Mostly new self-sustained model added