Added option for database prefix