A couple of specs added for Calculator entity