Update SQL accordingly.
Add back message method.