:gift: Configuration and refactor