Updated for JDeveloper generated crap