Move configuration into separate table