Added some methods to implement