Added config ability and removed hardcoded dependencies