Updated the way params and returns are parsed