Added helpers and a sample