Finished to append calling method with block. Some refactoring.