Fix superfluous comma
Added native support for ROLE