Fixed some bugs
Added prefix