Supporting more operations