Ease API and different fixes