started refactering apigee module and custom facts