Added optional type post, cleaned up categories