Updated to static structure