Added default approach to service resolving and decreased source compatibility to 1.7