Changes for the new API specifications