Add more specific fields to offer and request