Modified: Signature in query, execute and sql methods in Mapper class.