Added data fields to layouts