Fixed elements reorganization in pick methods
Added alternative value for property in constructor