Updated packages and removed Array/List usages and mutable variables