Added Jan class