[Resolved Issues]
Resolved issues after refactoring