Make client independent of core (use jar-file)