Added more expresions and types