Feature/improved config