Some small changes. Preparation for Authentication concept.