Add rest of variants

Signed-off-by: dr87 <nb00870@gmail.com>