Enhancement: more variables
Enhancement: add test for default behavior