Added configuration-less functionality.