Removed use of deprecated syntax, replaced with new syntax