Feature/configuration tuning

Ready to merge for testing