model: some inheritance and property handling improvements