Syntax change due to Eclipse issues