Add more override functions