Now also returns floor id