Fixing logic in order to instanciate without know the prefix