Add logger
Add singleton creators