Added Constants throughout for better reliability