Migrated OwnShipLayer to EPDLayerCommon