Added implementations (still needs test coverage)