Add null tile support