Added first version of client component container