Improved support for non-rectangular rooms