Add features #443 and #424