Added logging to various methods