Station model added, refactoring