Implement models from old repo