Added initial support for ellipses