Updates to support compute feature