Fixing injection ordering problem
Adding static feature