Add minor version 21 with focus controls