Modules support added