Added extra support for Android and Spring based applications