Structure improved

Methods added