Improved search, created trait, renamed diContainer and diContainerHTTP to container.