Added and cleaned up pins scaffold