Add more type stuff