added proguard optimizations