Removed final from fields