Some changes to default implementation