Refine CivilianApp