Achitectural mistake is fixed.