Feature/schema maybe