Updated serializer, basic OModel interfaces and classes