Implemented according last review comments