Minor update
Add support for platform definitions