Add flexibility