Added null current defaults