More object orientation and features