Fixed signature; added new API