Add descriptor and module base structure