some changes
Added support for Plates