Updated modules and some hot changes