Modifications to FI Portfolio for options stuff