Added lists and removed safe_eval