First modify application code