Added support for last insert id