Added some implementations