Updated scripts and added modules