Add comments + Add new directive