Attempt to reduce dependencies