Support for package arguments
Replacing String.indexOf with pre-cached strings