Added missing toolkit functions