Added dependency on elements module
Added default value handling