Made class use FQNS