Added new functions and lion class