Adding more body types and returning directly when matched