Trying to remove hard dependencies