Removed hard-coded values / types