Added validation, database and configuration support