Improve and update based on toolkit