Added modules and some functionality frameworks