added prefix support
added prefix suppot