Make schema format easier and added active