Optimize imports
Re-adding config file