update the API a bit for better merging capabilities
update examples to reflect new API changes