Add some more methods for the sole purpose of being redefined
Update TODO