Adding configuration options
Organizing import list