Tailorize the database library

Issue US336