Changes to improve flexibility