Fixed resources & added validation.