Add model classes and switch to forked gems