More ideas on the toolkit lib