Only include those things needed
Update dependencies