Types fixed. Added unimplemented methods(dirty hack)