Updated to include new features