Updated SAM service (part related to flows)