Added helpers and interfaces.