Feature/change schema define style