Expanded code to incorporate iBatis common