Schema setup improved