Separate more - add IOC