add info messages and refactor schema