* Improved performance in G\Handler