Added more make targets