Added dynamic return stuff