Add attributes to type/module definition

Sorry, it is an artifact after rebasing.