Added helpers and other stuff