Added namespace to library for better testability