Added more structure to manage and advanced topics