Added contacts directive, refactored comments directive