Improve definition of Algebra.