Added flexibility options