Update support files
Fix rubocop violations
Update specs