Add to issue [IS-5]

[IS-5]