Added where method and spec