Implement changes after testing against Scrom Cloud