Converted to Android library