Removed helpers from Base