Added some methods and added default implementations