Added more finals definition