Added helpers and basic authorization