Added owner information to structures