Removed Strings class, started entity modeling