Update APIs, remove actionBlock to clarify actions