Added support for saving room location