Fix issues from reviewer feedback. Abstract and default was missing.