Updated for beta 5, new maskImage property