Added first part of string parsing