Reverted Identifier and added Site field