Add rect and rectFill code