Added support to plain object definitions