Updated to include new functionality