Adding academy controller and reconstruct some others functions