Added prefix support

Needs Testing