Added review comments [FIXME_AK]