Added helpers and some classes from original project.