Updated scheme + added builder