Modified method data handling and fix #57