Move finite funcionality into approriate class