Added struct for convenience. Declarations updated.