Small sources refactoring, add offline.