Fixed lazy evaluation, added new getType function
Fixed conflict