Removed sample, added define
Improved module definition