Refactoring and concerns to simplify integration...