implemented additional attributes and block parsing