Update class and spec for basic creation scenarios