Adding gaps support and more.