Added specs for models & persistence