implemented hidden schema
fixed templates