Simpflication - removed wrapper methods