Made things work with object-oriented model