Integration of the administration part