Adding minor implementations