Changes in preparation for UI layer