Changed internal structure, using array instead of string - pushed to beta