Working version on AppBulder with different architecture