Added a couple useful variants and options