Module support added