Small adjustments to generic input and database.
Revert "Small adjustments to generic input and database."

This reverts commit a665bc366e1732dfed3f612f1dcc62ee8815179c.