Add several method and fixes