Added Some Module Management features