Made def lists flexible