Rent from investment property

Dear professor, This my doubt regarding rental income received from investment property at fair value. How should it be treated in financial statements? As per my knowledge, treating it as leased property under IFRS 16 and then account the rental as operating lease (rental income - in SPL) or finance lease (rental income - deduct lease receivable - in SFP) while the properties value is treated under IAS 40 with fair value gains/losses are recognized in SPL. Whether my treatment would be appropriate, or is there anything I'm missing out on? And also, thank you for all your lectures. I'd be forever grateful for it has been a great help:)