Added FQCN modifiers. Fixed double array bug.