Changed Api after some reconsiderations