Added additional utility functions