[develop] logic completion. added type support.