Bug fix: Missing abstract method fields()
Minor cleanup