A new law targeting smoking took effect Monday banning people from lighting up indoors on government agency, school and hospital premises, with more establishments like bars and restaurants to face similar rule changes next year.

Under the revised Health Promotion Law, fines of up to ¥300,000 ($2,780) could be imposed on smokers and up to ¥500,000 on facility managers for breaking the law.

The scope of the anti-smoking push will be expanded next April to include some eateries and bars as well as offices, railway buildings and hotel lobbies, among other places, ahead of the Tokyo Olympic and Paralympic Games starting July 2020.