Updated packages and added classes to handle functions
Added logic classes