Added default implementation