Add cos, sin, ceil, floor, sign
Cleverer matching of class template
Add new features