Added strip prefix feature