added more type information