Added helpers and demo