Move line number into directive

Move this to directive