Modified for inheritance
Update deps