* Updated Layer build