Added better support for prefixes
Added some useless function