added immutable string and updated headers