Improve manifest and steps