Fixed partitioning of string keys and removed USE statement in favour of dot notation