Add wrapper for better animation on android