Removed dependency on inheriting params