FLOE-119: Adding comments