Emberjs improvements