revert hard code prefix approch