Improving core configuration + db design