Added first layer of inspectability