Removing hardcode of database name in version 23