Default package - bug fixing. Refactoring.