Removed implementation, revised Api surface