Added missing files from Amogha's changes