Updated with additional fields