Implemented a part of the new API