Changed to rails 4 friendly superclass