Added a signature to method calls, fixed data api