Added more logging and constants