Investigate layering proposed on INT-995's comment:
https://jira.onap.org/browse/INT-995?focusedCommentId=38448&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-38448