Added some of the missing implementations.