Removed card fields and added them in constructor