Added Primary Key support
Added SuperTable support