Working on As Built structure