added support for common props and future scene block support