Add preserve drawing buffer, don't save null elements