Real world implementation driven changes