Added a couple more constants and actually include the structs module.