Minor modification!
Added support for prefix!