Modified function parameters and added new classes

Signed-off-by: Mihaela Martinas <martinas.mihaela21@gmail.com>