Adressed review comments