Exclusion shared basic functionality into a separate library (project) + some minor improvements