Added some more type aliases