Make extra features code faster