Simplified source & sink creation