Added prefixes to wi and odb