Changed class selection to be look like Java.