Close #22 Use heritage module