Added core and sample flow modifications