Added basic elliptics support