Added deprecated typedefs