Implemented more type handling