Updated method implementation