Refactor API to accommodate ancient RJ's comments and prepare the ground for iframe launcher