Added some extra functionality.