Few more inheritance tweaks as per XML Schema