Removed API dependency, fixed setup