Changing to a more API friendly setup