Refactor, add friendly ids