Updated to beta 5 syntax