Change arrangement. Add DB, etc.