Leon
New class and APIs added