Updates to newer syntax