Updated with latest dependencye