added @Inherited annotations per #611