add collection
refactaring
Bugfixed
Refactaring spec