Model restructure for adherence to RFC