Updates for code review - passed unit & integration tests