changed service and Component.java