Writter update references from schema
Rubocop corrections