Feature/dynamic comments