Added additional typedefs for clarity.