Updated it with basic paths and added service entry check