Updated with data annotations, etc.