Added additional functionality