Add support for single-level inheritance