First commit. Preparation for autowiring.