Changes for using Eluant by Android Core