Additional methods changes