Updated composer.lock and added general mail interceptor