Added more stuff in the spec