Added/Updated bunch of modules

Added/Updated bunch of modules and functions