Added some standard behaviour