Removed static modifier on some fields in the Engine class.