Added missing toolkit component
Cleaned up method definition