Added part of User and spec