Added dependency and changed class loading a little