Feature/schema replacement

#35